Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 21:51:07 +0000 (13:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 21:51:07 +0000 (13:51 -0800)

Trivial merge